var $mRevIdFetched;
var $mRevision;
var $mRedirectUrl;
+ var $mLatest;
/**#@-*/
/**
} else {
return $rt->getFullURL();
}
- }
+ }
return $rt;
}
}
$this->mIsRedirect = false;
$this->mRevIdFetched = 0;
$this->mRedirectUrl = false;
+ $this->mLatest = false;
}
/**
/**
* Get the contents of a page from its title and remove includeonly tags
*
- * TODO FIXME: This is only here because of the inputbox extension and
- * should be moved there
- *
- * @deprecated
- *
* @param string The title of the page
* @return string The contents of the page
*/
* Load the revision (including text) into this object
*/
function loadContent() {
- global $wgOut, $wgRequest;
-
if ( $this->mContentLoaded ) return;
# Query variables :P
* @param object $data
* @access private
*/
- function loadPageData( $data ) {
- $this->mTitle->mArticleID = $data->page_id;
- $this->mTitle->loadRestrictions( $data->page_restrictions );
- $this->mTitle->mRestrictionsLoaded = true;
+ function loadPageData( $data = 'fromdb' ) {
+ if ( $data === 'fromdb' ) {
+ $dbr =& $this->getDB();
+ $data = $this->pageDataFromId( $dbr, $this->getId() );
+ }
+
+ $lc =& LinkCache::singleton();
+ if ( $data ) {
+ $lc->addGoodLinkObj( $data->page_id, $this->mTitle );
+
+ $this->mTitle->mArticleID = $data->page_id;
+ $this->mTitle->loadRestrictions( $data->page_restrictions );
+ $this->mTitle->mRestrictionsLoaded = true;
- $this->mCounter = $data->page_counter;
- $this->mTouched = wfTimestamp( TS_MW, $data->page_touched );
- $this->mIsRedirect = $data->page_is_redirect;
- $this->mLatest = $data->page_latest;
+ $this->mCounter = $data->page_counter;
+ $this->mTouched = wfTimestamp( TS_MW, $data->page_touched );
+ $this->mIsRedirect = $data->page_is_redirect;
+ $this->mLatest = $data->page_latest;
+ } else {
+ $lc->addBadLinkObj( $this->mTitle );
+ $this->mTitle->mArticleID = 0;
+ }
$this->mDataLoaded = true;
}
}
}
- $this->mContent = $revision->getText();
+ // FIXME: Horrible, horrible! This content-loading interface just plain sucks.
+ // We should instead work with the Revision object when we need it...
+ $this->mContent = $revision->userCan( MW_REV_DELETED_TEXT ) ? $revision->getRawText() : "";
+ //$this->mContent = $revision->getText();
$this->mUser = $revision->getUser();
$this->mUserText = $revision->getUserText();
function getCount() {
if ( -1 == $this->mCounter ) {
$id = $this->getID();
- $dbr =& wfGetDB( DB_SLAVE );
- $this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
- 'Article::getCount', $this->getSelectOptions() );
+ if ( $id == 0 ) {
+ $this->mCounter = 0;
+ } else {
+ $dbr =& wfGetDB( DB_SLAVE );
+ $this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
+ 'Article::getCount', $this->getSelectOptions() );
+ }
}
return $this->mCounter;
}
* @access private
*/
function loadLastEdit() {
- global $wgOut;
-
if ( -1 != $this->mUser )
return;
}
function getTimestamp() {
- $this->loadLastEdit();
+ // Check if the field has been filled by ParserCache::get()
+ if ( !$this->mTimestamp ) {
+ $this->loadLastEdit();
+ }
return wfTimestamp(TS_MW, $this->mTimestamp);
}
* the given title.
*/
function view() {
- global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgContLang;
+ global $wgUser, $wgOut, $wgRequest, $wgContLang;
global $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol, $wgParser;
global $wgUseTrackbacks;
$sk = $wgUser->getSkin();
wfProfileOut( $fname );
return;
}
-
+
if ( empty( $oldid ) && $this->checkTouched() ) {
$wgOut->setETag($parserCache->getETag($this, $wgUser));
# We're looking at an old revision
if ( !empty( $oldid ) ) {
- $this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
- $wgOut->setRobotpolicy( 'noindex,follow' );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
+ if( is_null( $this->mRevision ) ) {
+ // FIXME: This would be a nice place to load the 'no such page' text.
+ } else {
+ $this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
+ if( $this->mRevision->isDeleted( MW_REV_DELETED_TEXT ) ) {
+ if( !$this->mRevision->userCan( MW_REV_DELETED_TEXT ) ) {
+ $wgOut->addWikiText( wfMsg( 'rev-deleted-text-permission' ) );
+ $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ return;
+ } else {
+ $wgOut->addWikiText( wfMsg( 'rev-deleted-text-view' ) );
+ // and we are allowed to see...
+ }
+ }
+ }
+
}
}
if( !$outputDone ) {
# If we have been passed an &rcid= parameter, we want to give the user a
# chance to mark this new article as patrolled.
- if ( $wgUseRCPatrol
- && !is_null($rcid)
- && $rcid != 0
- && $wgUser->isLoggedIn()
- && ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
- {
+ if ( $wgUseRCPatrol && !is_null( $rcid ) && $rcid != 0 && $wgUser->isAllowed( 'patrol' ) ) {
$wgOut->addHTML(
"<div class='patrollink'>" .
wfMsg ( 'markaspatrolledlink',
$this->view();
}
+ /**
+ * Handle action=purge
+ */
function purge() {
- global $wgUser, $wgRequest, $wgOut, $wgUseSquid;
-
- if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() || ! wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
- // Invalidate the cache
- $this->mTitle->invalidateCache();
+ global $wgUser, $wgRequest, $wgOut;
- if ( $wgUseSquid ) {
- // Commit the transaction before the purge is sent
- $dbw = wfGetDB( DB_MASTER );
- $dbw->immediateCommit();
-
- // Send purge
- $update = SquidUpdate::newSimplePurge( $this->mTitle );
- $update->doUpdate();
+ if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() ) {
+ if( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
+ $this->doPurge();
}
- $this->view();
} else {
$msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
$action = $this->mTitle->escapeLocalURL( 'action=purge' );
$wgOut->addHTML( $msg );
}
}
+
+ /**
+ * Perform the actions of a page purging
+ */
+ function doPurge() {
+ global $wgUseSquid;
+ // Invalidate the cache
+ $this->mTitle->invalidateCache();
+
+ if ( $wgUseSquid ) {
+ // Commit the transaction before the purge is sent
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->immediateCommit();
+
+ // Send purge
+ $update = SquidUpdate::newSimplePurge( $this->mTitle );
+ $update->doUpdate();
+ }
+ $this->view();
+ }
/**
* Insert a new empty page record for this article.
* @access private
*/
function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
- global $wgOut, $wgUser, $wgUseSquid;
+ global $wgUser;
$fname = 'Article::insertNewArticle';
wfProfileIn( $fname );
Article::onArticleCreate( $this->mTitle );
if(!$suppressRC) {
require_once( 'RecentChange.php' );
- RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default',
+ $rcid = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default',
'', strlen( $text ), $revisionId );
+ # Mark as patrolled if the user can and has the option set
+ if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) {
+ RecentChange::markPatrolled( $rcid );
+ }
}
if ($watchthis) {
- if(!$this->mTitle->userIsWatching()) $this->watch();
+ if(!$this->mTitle->userIsWatching()) $this->doWatch();
} else {
if ( $this->mTitle->userIsWatching() ) {
- $this->unwatch();
+ $this->doUnwatch();
}
}
* first set $wgUser, and clean up $wgDeferredUpdates after each edit.
*/
function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
- global $wgOut, $wgUser, $wgDBtransactions, $wgMwRedir, $wgUseSquid;
+ global $wgUser, $wgDBtransactions, $wgUseSquid;
global $wgPostCommitUpdateList, $wgUseFileCache;
$fname = 'Article::updateArticle';
# Update recentchanges and purge cache and whatnot
require_once( 'RecentChange.php' );
$bot = (int)($wgUser->isBot() || $forceBot);
- RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
+ $rcid = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
$lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
$revisionId );
+
+ # Mark as patrolled if the user can do so and has it set in their options
+ if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) {
+ RecentChange::markPatrolled( $rcid );
+ }
+
$dbw->commit();
// Update caches outside the main transaction
if (!$this->mTitle->userIsWatching()) {
$dbw->immediateCommit();
$dbw->begin();
- $this->watch();
+ $this->doWatch();
$dbw->commit();
}
} else {
if ( $this->mTitle->userIsWatching() ) {
$dbw->immediateCommit();
$dbw->begin();
- $this->unwatch();
+ $this->doUnwatch();
$dbw->commit();
}
}
* the link tables and redirect to the new page.
*/
function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
- global $wgOut, $wgUser;
- global $wgUseEnotif;
+ global $wgOut;
$fname = 'Article::showArticle';
wfProfileIn( $fname );
* Mark this particular edit as patrolled
*/
function markpatrolled() {
- global $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgUseRCPatrol, $wgUser;
+ global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUser;
$wgOut->setRobotpolicy( 'noindex,follow' );
# Check RC patrol config. option
}
# Check permissions
- if( $wgUser->isLoggedIn() ) {
- if( !$wgUser->isAllowed( 'patrol' ) ) {
- $wgOut->permissionRequired( 'patrol' );
- return;
- }
- } else {
- $wgOut->loginToUse();
+ if( !$wgUser->isAllowed( 'patrol' ) ) {
+ $wgOut->permissionRequired( 'patrol' );
return;
}
$rcid = $wgRequest->getVal( 'rcid' );
- if ( !is_null ( $rcid ) )
- {
- if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) ) ) {
+ if ( !is_null ( $rcid ) ) {
+ if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, false ) ) ) {
require_once( 'RecentChange.php' );
RecentChange::markPatrolled( $rcid );
- wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) );
+ wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, false ) );
$wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
$wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
}
$rcTitle = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
$wgOut->returnToMain( false, $rcTitle->getPrefixedText() );
}
- else
- {
+ else {
$wgOut->errorpage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
}
}
/**
- * Add this page to $wgUser's watchlist
+ * User-interface handler for the "watch" action
*/
function watch() {
$wgOut->readOnlyPage();
return;
}
-
- if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
-
- $wgUser->addWatch( $this->mTitle );
- $wgUser->saveSettings();
-
- wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this));
-
+
+ if( $this->doWatch() ) {
$wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
$wgOut->setRobotpolicy( 'noindex,follow' );
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
-
+
/**
- * Stop watching a page
+ * Add this page to $wgUser's watchlist
+ * @return bool true on successful watch operation
*/
+ function doWatch() {
+ global $wgUser;
+ if( $wgUser->isAnon() ) {
+ return false;
+ }
+
+ if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
+ $wgUser->addWatch( $this->mTitle );
+ $wgUser->saveSettings();
+
+ return wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this));
+ }
+
+ return false;
+ }
+ /**
+ * User interface handler for the "unwatch" action.
+ */
function unwatch() {
global $wgUser, $wgOut;
$wgOut->readOnlyPage();
return;
}
-
- if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
-
- $wgUser->removeWatch( $this->mTitle );
- $wgUser->saveSettings();
-
- wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
-
+
+ if( $this->doUnwatch() ) {
$wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
$wgOut->setRobotpolicy( 'noindex,follow' );
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
+
+ /**
+ * Stop watching a page
+ * @return bool true on successful unwatch
+ */
+ function doUnwatch() {
+ global $wgUser;
+ if( $wgUser->isAnon() ) {
+ return false;
+ }
+
+ if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
+ $wgUser->removeWatch( $this->mTitle );
+ $wgUser->saveSettings();
+
+ return wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
+ }
+
+ return false;
+ }
/**
* action=protect handler
* @return bool true on success
*/
function updateRestrictions( $limit = array(), $reason = '' ) {
- global $wgUser, $wgOut, $wgRequest;
+ global $wgUser;
if ( !$wgUser->isAllowed( 'protect' ) ) {
return false;
}
/**
- * Get the last N authors
+ * Get the last N authors
* @param int $num Number of revisions to get
* @param string $revLatest The latest rev_id, selected from the master (optional)
* @return array Array of authors, duplicates not removed
'page_namespace' => $this->mTitle->getNamespace(),
'page_title' => $this->mTitle->getDBkey(),
'rev_page = page_id'
- ), $fname, $this->getSelectOptions( array(
+ ), $fname, $this->getSelectOptions( array(
'ORDER BY' => 'rev_timestamp DESC',
'LIMIT' => $num
) )
* Perform a deletion and output success or failure messages
*/
function doDelete( $reason ) {
- global $wgOut, $wgUser, $wgContLang;
+ global $wgOut, $wgUser;
$fname = 'Article::doDelete';
wfDebug( $fname."\n" );
* Returns success
*/
function doDeleteArticle( $reason ) {
- global $wgUser, $wgUseSquid, $wgDeferredUpdateList;
+ global $wgUseSquid, $wgDeferredUpdateList;
global $wgPostCommitUpdateList, $wgUseTrackbacks;
$fname = 'Article::doDeleteArticle';
# Parse the text
$options = new ParserOptions;
- $options->setTidy(true);
+ $options->setTidy(true);
$poutput = $wgParser->parse( $text, $this->mTitle, $options, true, true, $newid );
# Save it to the parser cache
# If this is another user's talk page, update newtalk
if ($this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getName()) {
- $other = User::newFromName( $shortTitle );
- if( is_null( $other ) && User::isIP( $shortTitle ) ) {
- // An anonymous user
- $other = new User();
- $other->setName( $shortTitle );
- }
- if( $other ) {
- $other->setNewtalk( true );
+ if (wfRunHooks('ArticleEditUpdateNewTalk', array(&$this)) ) {
+ $other = User::newFromName( $shortTitle );
+ if( is_null( $other ) && User::isIP( $shortTitle ) ) {
+ // An anonymous user
+ $other = new User();
+ $other->setName( $shortTitle );
+ }
+ if( $other ) {
+ $other->setNewtalk( true );
+ }
}
}
$touched = $this->mTouched;
$cache = new CacheManager( $this->mTitle );
if($cache->isFileCacheGood( $touched )) {
- global $wgOut;
wfDebug( " tryFileCache() - about to load\n" );
$cache->loadFromFileCache();
return true;
function checkTouched() {
$fname = 'Article::checkTouched';
if( !$this->mDataLoaded ) {
- $dbr =& $this->getDB();
- $data = $this->pageDataFromId( $dbr, $this->getId() );
- if( $data ) {
- $this->loadPageData( $data );
- }
+ $this->loadPageData();
}
return !$this->mIsRedirect;
}
function getTouched() {
# Ensure that page data has been loaded
if( !$this->mDataLoaded ) {
- $dbr =& $this->getDB();
- $data = $this->pageDataFromId( $dbr, $this->getId() );
- if( $data ) {
- $this->loadPageData( $data );
- }
+ $this->loadPageData();
}
return $this->mTouched;
}
+ /**
+ * Get the page_latest field
+ */
+ function getLatest() {
+ if ( !$this->mDataLoaded ) {
+ $this->loadPageData();
+ }
+ return $this->mLatest;
+ }
+
/**
* Edit an article without doing all that other stuff
* The article must already exist; link tables etc
$old_user_abort = ignore_user_abort( true );
$dbw->query("LOCK TABLES $hitcounterTable WRITE");
- $dbw->query("CREATE TEMPORARY TABLE $acchitsTable TYPE=HEAP ".
+ $dbw->query("CREATE TEMPORARY TABLE $acchitsTable ENGINE=HEAP ".
"SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable ".
'GROUP BY hc_id');
$dbw->query("DELETE FROM $hitcounterTable");
function getUsedTemplates() {
$result = array();
$id = $this->mTitle->getArticleID();
+ if( $id == 0 ) {
+ return array();
+ }
$dbr =& wfGetDB( DB_SLAVE );
$res = $dbr->select( array( 'templatelinks' ),
dépôts / lhc / web / wiklou.git / blobdiff